From a1332167fb277dfb54a7111b73d594f2d753c7a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Aug 2015 07:22:05 -0400 Subject: [PATCH] color chooser: Reset show-editor on unmap We have a testcolorchooser test, with a --edit option. It was supposed to make the color chooser come up in edit mode, but it didn't work ever since we dropped the ::response handler. Fix it by resetting show-editor on unmap, instead of on map. This way, users can set show-editor before showing the dialog, and it will take effect. --- gtk/gtkcolorchooserdialog.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index 176f939072..fdedc8786c 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -119,16 +119,14 @@ G_GNUC_END_IGNORE_DEPRECATIONS } static void -gtk_color_chooser_dialog_map (GtkWidget *widget) +gtk_color_chooser_dialog_unmap (GtkWidget *widget) { + GTK_WIDGET_CLASS (gtk_color_chooser_dialog_parent_class)->unmap (widget); + /* We never want the dialog to come up with the editor, * even if it was showing the editor the last time it was used. */ - g_object_set (GTK_COLOR_CHOOSER_DIALOG (widget)->priv->chooser, - "show-editor", FALSE, - NULL); - - GTK_WIDGET_CLASS (gtk_color_chooser_dialog_parent_class)->map (widget); + g_object_set (widget, "show-editor", FALSE, NULL); } static void @@ -207,7 +205,7 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class) object_class->get_property = gtk_color_chooser_dialog_get_property; object_class->set_property = gtk_color_chooser_dialog_set_property; - widget_class->map = gtk_color_chooser_dialog_map; + widget_class->unmap = gtk_color_chooser_dialog_unmap; g_object_class_override_property (object_class, PROP_RGBA, "rgba"); g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha"); -- 2.30.2